Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Wed, 8 Jul 2015 21:14:02 +0000 (17:14 -0400)
committerTom Rini <[email protected]>
Wed, 8 Jul 2015 21:14:02 +0000 (17:14 -0400)

Trivial merge